merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 2 Oct 2006 01:10:18 +0000 (19:10 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Mon, 2 Oct 2006 01:10:18 +0000 (19:10 -0600)

Trivial merge